diff --git a/generate_vendor_package.sh b/generate_vendor_package.sh
index 323c930..8f4afb0 100755
--- a/generate_vendor_package.sh
+++ b/generate_vendor_package.sh
@@ -11,7 +11,7 @@
 TARGET_DIR=out/vendor/linaro/
 
 
-DEV_TARGETS="shared db845c rb5 linux-firmware hikey960 sm8x50"
+DEV_TARGETS="shared db845c hikey960 rb5 sm8x50"
 
 for DEV in $DEV_TARGETS; do
   DEV_TARGET_DIR=$TARGET_DIR/$DEV/$VER
diff --git a/src/README b/src/README
index f9529b8..6189274 100644
--- a/src/README
+++ b/src/README
@@ -12,14 +12,14 @@
 
 ./linaro-vendor-package/
 └── src/
-    ├── linux-firmware/
-    │   All but one (ath10k/WCN3390/hw1.0/board-2.bin) binaries are covered
-    │   under upstream licenses mentioned in WHENCE file.
-    │   https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git (f5d519563ac9)
-    │
-    │   ath10k/WCN3390/hw1.0/board-2.bin binary for db845c is picked from
-    │   linux-firmware.git fork:
-    │   https://github.com/andersson/linux-firmware/commit/e165604ca024
+    ├── shared/
+    │   └── linux-firmware/
+    │       All but one (ath10k/WCN3390/hw1.0/board-2.bin) binaries are covered
+    │       under upstream licenses mentioned in WHENCE file.
+    │       https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git (f5d519563ac9)
+    │       ath10k/WCN3390/hw1.0/board-2.bin binary for db845c is picked from
+    │       linux-firmware.git fork:
+    │       https://github.com/andersson/linux-firmware/commit/e165604ca024
     ├── db845c/
     │   ├── dragonboard-845c-bootloader-ufs-aosp/
     │   │   Db845c bootloader/rescue package is covered under LICENSE file.
diff --git a/src/db845c/device.mk b/src/db845c/device.mk
index f5f94e8..909d253 100644
--- a/src/db845c/device.mk
+++ b/src/db845c/device.mk
@@ -53,7 +53,7 @@
 PRODUCT_PACKAGES +=	\
     devcfg.mbn
 
-FIRMWARE_VENDOR_PATH := $(LINARO_VENDOR_PATH)/linux-firmware/$(EXPECTED_LINARO_VENDOR_VERSION)
+FIRMWARE_VENDOR_PATH := $(LINARO_VENDOR_PATH)/shared/$(EXPECTED_LINARO_VENDOR_VERSION)/linux-firmware
 
 # Copy Venus and ADSP/CDSP firmware files to generic ramdisk or vendor ramdisk to drop the
 # dependency on user sysfs fw loader helper (FW_LOADER_USER_HELPER_FALLBACK)
diff --git a/src/rb5/device.mk b/src/rb5/device.mk
index 03ec1d5..265c2ba 100644
--- a/src/rb5/device.mk
+++ b/src/rb5/device.mk
@@ -46,7 +46,7 @@
     venus.mbn.sm8250	\
     venus.mdt.sm8250
 
-FIRMWARE_VENDOR_PATH := $(LINARO_VENDOR_PATH)/linux-firmware/$(EXPECTED_LINARO_VENDOR_VERSION)
+FIRMWARE_VENDOR_PATH := $(LINARO_VENDOR_PATH)/shared/$(EXPECTED_LINARO_VENDOR_VERSION)/linux-firmware
 
 # Also copy a set of Venus, WiFi-BT and ADSP-CDSP firmware files to generic ramdisk or vendor ramdisk to drop the
 # dependency on user sysfs fw loader helper (FW_LOADER_USER_HELPER_FALLBACK)
diff --git a/src/shared/Android.bp b/src/shared/Android.bp
index 498e7d9..2370d6d 100644
--- a/src/shared/Android.bp
+++ b/src/shared/Android.bp
@@ -1 +1,5 @@
 soong_namespace {}
+
+subdirs = [
+    "linux-firmware",
+]
diff --git a/src/linux-firmware/Android.bp b/src/shared/linux-firmware/Android.bp
similarity index 100%
rename from src/linux-firmware/Android.bp
rename to src/shared/linux-firmware/Android.bp
diff --git a/src/linux-firmware/LICENCE.linaro b/src/shared/linux-firmware/LICENCE.linaro
similarity index 100%
rename from src/linux-firmware/LICENCE.linaro
rename to src/shared/linux-firmware/LICENCE.linaro
diff --git a/src/linux-firmware/LICENSE.Lontium b/src/shared/linux-firmware/LICENSE.Lontium
similarity index 100%
rename from src/linux-firmware/LICENSE.Lontium
rename to src/shared/linux-firmware/LICENSE.Lontium
diff --git a/src/linux-firmware/LICENSE.QualcommAtheros_ath10k b/src/shared/linux-firmware/LICENSE.QualcommAtheros_ath10k
similarity index 100%
rename from src/linux-firmware/LICENSE.QualcommAtheros_ath10k
rename to src/shared/linux-firmware/LICENSE.QualcommAtheros_ath10k
diff --git a/src/linux-firmware/LICENSE.qcom b/src/shared/linux-firmware/LICENSE.qcom
similarity index 100%
rename from src/linux-firmware/LICENSE.qcom
rename to src/shared/linux-firmware/LICENSE.qcom
diff --git a/src/linux-firmware/WHENCE b/src/shared/linux-firmware/WHENCE
similarity index 100%
rename from src/linux-firmware/WHENCE
rename to src/shared/linux-firmware/WHENCE
diff --git a/src/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin b/src/shared/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin
similarity index 100%
rename from src/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin
rename to src/shared/linux-firmware/ath10k/WCN3990/hw1.0/board-2.bin
Binary files differ
diff --git a/src/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin b/src/shared/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
similarity index 100%
rename from src/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
rename to src/shared/linux-firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
Binary files differ
diff --git a/src/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp b/src/shared/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
similarity index 100%
rename from src/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
rename to src/shared/linux-firmware/ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
diff --git a/src/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn b/src/shared/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
similarity index 100%
rename from src/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
rename to src/shared/linux-firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
Binary files differ
diff --git a/src/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt b/src/shared/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt
similarity index 100%
rename from src/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt
rename to src/shared/linux-firmware/ath11k/QCA6390/hw2.0/Notice.txt
diff --git a/src/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin b/src/shared/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin
similarity index 100%
rename from src/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin
rename to src/shared/linux-firmware/ath11k/QCA6390/hw2.0/amss.bin
Binary files differ
diff --git a/src/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin b/src/shared/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin
similarity index 100%
rename from src/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin
rename to src/shared/linux-firmware/ath11k/QCA6390/hw2.0/m3.bin
Binary files differ
diff --git a/src/linux-firmware/ath12k/WCN7850/hw2.0/Notice.txt b/src/shared/linux-firmware/ath12k/WCN7850/hw2.0/Notice.txt
similarity index 100%
rename from src/linux-firmware/ath12k/WCN7850/hw2.0/Notice.txt
rename to src/shared/linux-firmware/ath12k/WCN7850/hw2.0/Notice.txt
diff --git a/src/linux-firmware/ath12k/WCN7850/hw2.0/amss.bin b/src/shared/linux-firmware/ath12k/WCN7850/hw2.0/amss.bin
similarity index 100%
rename from src/linux-firmware/ath12k/WCN7850/hw2.0/amss.bin
rename to src/shared/linux-firmware/ath12k/WCN7850/hw2.0/amss.bin
Binary files differ
diff --git a/src/linux-firmware/ath12k/WCN7850/hw2.0/board-2.bin b/src/shared/linux-firmware/ath12k/WCN7850/hw2.0/board-2.bin
similarity index 100%
rename from src/linux-firmware/ath12k/WCN7850/hw2.0/board-2.bin
rename to src/shared/linux-firmware/ath12k/WCN7850/hw2.0/board-2.bin
Binary files differ
diff --git a/src/linux-firmware/ath12k/WCN7850/hw2.0/m3.bin b/src/shared/linux-firmware/ath12k/WCN7850/hw2.0/m3.bin
similarity index 100%
rename from src/linux-firmware/ath12k/WCN7850/hw2.0/m3.bin
rename to src/shared/linux-firmware/ath12k/WCN7850/hw2.0/m3.bin
Binary files differ
diff --git a/src/linux-firmware/lt9611uxc_fw.bin b/src/shared/linux-firmware/lt9611uxc_fw.bin
similarity index 100%
rename from src/linux-firmware/lt9611uxc_fw.bin
rename to src/shared/linux-firmware/lt9611uxc_fw.bin
Binary files differ
diff --git a/src/linux-firmware/qca/NOTICE.txt b/src/shared/linux-firmware/qca/NOTICE.txt
similarity index 100%
rename from src/linux-firmware/qca/NOTICE.txt
rename to src/shared/linux-firmware/qca/NOTICE.txt
diff --git a/src/linux-firmware/qca/crbtfw21.tlv b/src/shared/linux-firmware/qca/crbtfw21.tlv
similarity index 100%
rename from src/linux-firmware/qca/crbtfw21.tlv
rename to src/shared/linux-firmware/qca/crbtfw21.tlv
Binary files differ
diff --git a/src/linux-firmware/qca/crnv21.bin b/src/shared/linux-firmware/qca/crnv21.bin
similarity index 100%
rename from src/linux-firmware/qca/crnv21.bin
rename to src/shared/linux-firmware/qca/crnv21.bin
Binary files differ
diff --git a/src/linux-firmware/qca/htbtfw20.tlv b/src/shared/linux-firmware/qca/htbtfw20.tlv
similarity index 100%
rename from src/linux-firmware/qca/htbtfw20.tlv
rename to src/shared/linux-firmware/qca/htbtfw20.tlv
Binary files differ
diff --git a/src/linux-firmware/qca/htnv20.bin b/src/shared/linux-firmware/qca/htnv20.bin
similarity index 100%
rename from src/linux-firmware/qca/htnv20.bin
rename to src/shared/linux-firmware/qca/htnv20.bin
Binary files differ
diff --git a/src/linux-firmware/qcom/Android.bp b/src/shared/linux-firmware/qcom/Android.bp
similarity index 100%
rename from src/linux-firmware/qcom/Android.bp
rename to src/shared/linux-firmware/qcom/Android.bp
diff --git a/src/linux-firmware/qcom/NOTICE.txt b/src/shared/linux-firmware/qcom/NOTICE.txt
similarity index 100%
rename from src/linux-firmware/qcom/NOTICE.txt
rename to src/shared/linux-firmware/qcom/NOTICE.txt
diff --git a/src/linux-firmware/qcom/a630_gmu.bin b/src/shared/linux-firmware/qcom/a630_gmu.bin
similarity index 100%
rename from src/linux-firmware/qcom/a630_gmu.bin
rename to src/shared/linux-firmware/qcom/a630_gmu.bin
Binary files differ
diff --git a/src/linux-firmware/qcom/a630_sqe.fw b/src/shared/linux-firmware/qcom/a630_sqe.fw
similarity index 100%
rename from src/linux-firmware/qcom/a630_sqe.fw
rename to src/shared/linux-firmware/qcom/a630_sqe.fw
Binary files differ
diff --git a/src/linux-firmware/qcom/a650_gmu.bin b/src/shared/linux-firmware/qcom/a650_gmu.bin
similarity index 100%
rename from src/linux-firmware/qcom/a650_gmu.bin
rename to src/shared/linux-firmware/qcom/a650_gmu.bin
Binary files differ
diff --git a/src/linux-firmware/qcom/a650_sqe.fw b/src/shared/linux-firmware/qcom/a650_sqe.fw
similarity index 100%
rename from src/linux-firmware/qcom/a650_sqe.fw
rename to src/shared/linux-firmware/qcom/a650_sqe.fw
Binary files differ
diff --git a/src/linux-firmware/qcom/sdm845/a630_zap.mbn b/src/shared/linux-firmware/qcom/sdm845/a630_zap.mbn
similarity index 100%
rename from src/linux-firmware/qcom/sdm845/a630_zap.mbn
rename to src/shared/linux-firmware/qcom/sdm845/a630_zap.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/sdm845/adsp.mbn b/src/shared/linux-firmware/qcom/sdm845/adsp.mbn
similarity index 100%
rename from src/linux-firmware/qcom/sdm845/adsp.mbn
rename to src/shared/linux-firmware/qcom/sdm845/adsp.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/sdm845/adspr.jsn b/src/shared/linux-firmware/qcom/sdm845/adspr.jsn
similarity index 100%
rename from src/linux-firmware/qcom/sdm845/adspr.jsn
rename to src/shared/linux-firmware/qcom/sdm845/adspr.jsn
diff --git a/src/linux-firmware/qcom/sdm845/adspua.jsn b/src/shared/linux-firmware/qcom/sdm845/adspua.jsn
similarity index 100%
rename from src/linux-firmware/qcom/sdm845/adspua.jsn
rename to src/shared/linux-firmware/qcom/sdm845/adspua.jsn
diff --git a/src/linux-firmware/qcom/sdm845/cdsp.mbn b/src/shared/linux-firmware/qcom/sdm845/cdsp.mbn
similarity index 100%
rename from src/linux-firmware/qcom/sdm845/cdsp.mbn
rename to src/shared/linux-firmware/qcom/sdm845/cdsp.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/sdm845/cdspr.jsn b/src/shared/linux-firmware/qcom/sdm845/cdspr.jsn
similarity index 100%
rename from src/linux-firmware/qcom/sdm845/cdspr.jsn
rename to src/shared/linux-firmware/qcom/sdm845/cdspr.jsn
diff --git a/src/linux-firmware/qcom/sdm845/mba.mbn b/src/shared/linux-firmware/qcom/sdm845/mba.mbn
similarity index 100%
rename from src/linux-firmware/qcom/sdm845/mba.mbn
rename to src/shared/linux-firmware/qcom/sdm845/mba.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/sdm845/modem.mbn b/src/shared/linux-firmware/qcom/sdm845/modem.mbn
similarity index 100%
rename from src/linux-firmware/qcom/sdm845/modem.mbn
rename to src/shared/linux-firmware/qcom/sdm845/modem.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/sdm845/modemuw.jsn b/src/shared/linux-firmware/qcom/sdm845/modemuw.jsn
similarity index 100%
rename from src/linux-firmware/qcom/sdm845/modemuw.jsn
rename to src/shared/linux-firmware/qcom/sdm845/modemuw.jsn
diff --git a/src/linux-firmware/qcom/sm8250/a650_zap.mbn b/src/shared/linux-firmware/qcom/sm8250/a650_zap.mbn
similarity index 100%
rename from src/linux-firmware/qcom/sm8250/a650_zap.mbn
rename to src/shared/linux-firmware/qcom/sm8250/a650_zap.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/sm8250/adsp.mbn b/src/shared/linux-firmware/qcom/sm8250/adsp.mbn
similarity index 100%
rename from src/linux-firmware/qcom/sm8250/adsp.mbn
rename to src/shared/linux-firmware/qcom/sm8250/adsp.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/sm8250/adspr.jsn b/src/shared/linux-firmware/qcom/sm8250/adspr.jsn
similarity index 100%
rename from src/linux-firmware/qcom/sm8250/adspr.jsn
rename to src/shared/linux-firmware/qcom/sm8250/adspr.jsn
diff --git a/src/linux-firmware/qcom/sm8250/adspua.jsn b/src/shared/linux-firmware/qcom/sm8250/adspua.jsn
similarity index 100%
rename from src/linux-firmware/qcom/sm8250/adspua.jsn
rename to src/shared/linux-firmware/qcom/sm8250/adspua.jsn
diff --git a/src/linux-firmware/qcom/sm8250/cdsp.mbn b/src/shared/linux-firmware/qcom/sm8250/cdsp.mbn
similarity index 100%
rename from src/linux-firmware/qcom/sm8250/cdsp.mbn
rename to src/shared/linux-firmware/qcom/sm8250/cdsp.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/sm8250/cdspr.jsn b/src/shared/linux-firmware/qcom/sm8250/cdspr.jsn
similarity index 100%
rename from src/linux-firmware/qcom/sm8250/cdspr.jsn
rename to src/shared/linux-firmware/qcom/sm8250/cdspr.jsn
diff --git a/src/linux-firmware/qcom/sm8550/SM8550-HDK-tplg.bin b/src/shared/linux-firmware/qcom/sm8550/SM8550-HDK-tplg.bin
similarity index 100%
rename from src/linux-firmware/qcom/sm8550/SM8550-HDK-tplg.bin
rename to src/shared/linux-firmware/qcom/sm8550/SM8550-HDK-tplg.bin
Binary files differ
diff --git a/src/linux-firmware/qcom/sm8550/SM8550-QRD-tplg.bin b/src/shared/linux-firmware/qcom/sm8550/SM8550-QRD-tplg.bin
similarity index 100%
rename from src/linux-firmware/qcom/sm8550/SM8550-QRD-tplg.bin
rename to src/shared/linux-firmware/qcom/sm8550/SM8550-QRD-tplg.bin
Binary files differ
diff --git a/src/linux-firmware/qcom/venus-5.2/venus.b00 b/src/shared/linux-firmware/qcom/venus-5.2/venus.b00
similarity index 100%
rename from src/linux-firmware/qcom/venus-5.2/venus.b00
rename to src/shared/linux-firmware/qcom/venus-5.2/venus.b00
Binary files differ
diff --git a/src/linux-firmware/qcom/venus-5.2/venus.b01 b/src/shared/linux-firmware/qcom/venus-5.2/venus.b01
similarity index 100%
rename from src/linux-firmware/qcom/venus-5.2/venus.b01
rename to src/shared/linux-firmware/qcom/venus-5.2/venus.b01
Binary files differ
diff --git a/src/linux-firmware/qcom/venus-5.2/venus.b02 b/src/shared/linux-firmware/qcom/venus-5.2/venus.b02
similarity index 100%
rename from src/linux-firmware/qcom/venus-5.2/venus.b02
rename to src/shared/linux-firmware/qcom/venus-5.2/venus.b02
Binary files differ
diff --git a/src/linux-firmware/qcom/venus-5.2/venus.b03 b/src/shared/linux-firmware/qcom/venus-5.2/venus.b03
similarity index 100%
rename from src/linux-firmware/qcom/venus-5.2/venus.b03
rename to src/shared/linux-firmware/qcom/venus-5.2/venus.b03
Binary files differ
diff --git a/src/linux-firmware/qcom/venus-5.2/venus.b04 b/src/shared/linux-firmware/qcom/venus-5.2/venus.b04
similarity index 100%
rename from src/linux-firmware/qcom/venus-5.2/venus.b04
rename to src/shared/linux-firmware/qcom/venus-5.2/venus.b04
Binary files differ
diff --git a/src/linux-firmware/qcom/venus-5.2/venus.mbn b/src/shared/linux-firmware/qcom/venus-5.2/venus.mbn
similarity index 100%
rename from src/linux-firmware/qcom/venus-5.2/venus.mbn
rename to src/shared/linux-firmware/qcom/venus-5.2/venus.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/venus-5.2/venus.mdt b/src/shared/linux-firmware/qcom/venus-5.2/venus.mdt
similarity index 100%
rename from src/linux-firmware/qcom/venus-5.2/venus.mdt
rename to src/shared/linux-firmware/qcom/venus-5.2/venus.mdt
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b00 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b00
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b00
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b00
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b01 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b01
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b01
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b01
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b02 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b02
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b02
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b02
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b03 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b03
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b03
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b03
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b04 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b04
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b04
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b04
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b05 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b05
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b05
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b05
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b06 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b06
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b06
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b06
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b07 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b07
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b07
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b07
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b08 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b08
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b08
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b08
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b09 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b09
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b09
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b09
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b10 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b10
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b10
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b10
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.b19 b/src/shared/linux-firmware/qcom/vpu-1.0/venus.b19
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.b19
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.b19
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.mbn b/src/shared/linux-firmware/qcom/vpu-1.0/venus.mbn
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.mbn
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.mbn
Binary files differ
diff --git a/src/linux-firmware/qcom/vpu-1.0/venus.mdt b/src/shared/linux-firmware/qcom/vpu-1.0/venus.mdt
similarity index 100%
rename from src/linux-firmware/qcom/vpu-1.0/venus.mdt
rename to src/shared/linux-firmware/qcom/vpu-1.0/venus.mdt
Binary files differ
diff --git a/src/sm8x50/device.mk b/src/sm8x50/device.mk
index 9e0a86e..0489ded 100644
--- a/src/sm8x50/device.mk
+++ b/src/sm8x50/device.mk
@@ -9,7 +9,7 @@
     SM8550-HDK-tplg.bin	\
     SM8550-QRD-tplg.bin
 
-FIRMWARE_VENDOR_PATH := $(LINARO_VENDOR_PATH)/linux-firmware/$(EXPECTED_LINARO_VENDOR_VERSION)
+FIRMWARE_VENDOR_PATH := $(LINARO_VENDOR_PATH)/shared/$(EXPECTED_LINARO_VENDOR_VERSION)/linux-firmware
 
 # Copy notice/license files to rootfs
 # Not an AOSP requirement but other Linux distros do this